listboxrow: Derive from GtkWidget

We want to remove GtkBin and GtkContainer as they don't
provide much useful functionality anymore.

See #2681

diff --git a/demos/icon-browser/iconbrowserwin.c b/demos/icon-browser/iconbrowserwin.c
index 858e246c5e11999d309ac2237b7aca127241aaac..b5250343621535ea31dffe602dd6845e0dbf22e5 100644 (file)
--- a/demos/icon-browser/iconbrowserwin.c
+++ b/demos/icon-browser/iconbrowserwin.c
@@ -228,7 +228,7 @@ selected_context_changed (GtkListBox *list, IconBrowserWindow *win)
 
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (win->search), FALSE);
 
-  label = gtk_bin_get_child (GTK_BIN (row));
+  label = gtk_list_box_row_get_child (GTK_LIST_BOX_ROW (row));
   win->current_context = g_object_get_data (G_OBJECT (label), "context");
   gtk_tree_model_filter_refilter (win->filter_model);
 }

diff --git a/gtk/a11y/gtklistboxrowaccessible.c b/gtk/a11y/gtklistboxrowaccessible.c
index 27f962347ed9998b56a81b6b692e7aede231d35f..6a37efb1a57e9e932ca3bf7db00b39468b355242 100644 (file)
--- a/gtk/a11y/gtklistboxrowaccessible.c
+++ b/gtk/a11y/gtklistboxrowaccessible.c
@@ -22,7 +22,7 @@
 #include "gtk/gtklistbox.h"
 
 
-G_DEFINE_TYPE (GtkListBoxRowAccessible, gtk_list_box_row_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE)
+G_DEFINE_TYPE (GtkListBoxRowAccessible, gtk_list_box_row_accessible, GTK_TYPE_WIDGET_ACCESSIBLE)
 
 static void
 gtk_list_box_row_accessible_init (GtkListBoxRowAccessible *accessible)
@@ -50,7 +50,7 @@ gtk_list_box_row_accessible_ref_state_set (AtkObject *obj)
   if (widget != NULL)
     {
       parent = gtk_widget_get_parent (widget);
-      if (parent != NULL && 
+      if (parent != NULL &&
           GTK_IS_LIST_BOX (parent) &&
           gtk_list_box_get_selection_mode (GTK_LIST_BOX (parent)) != GTK_SELECTION_NONE)
         atk_state_set_add_state (state_set, ATK_STATE_SELECTABLE);

diff --git a/gtk/gtklistbox.c b/gtk/gtklistbox.c
index 28f72990230ae0f37a67f937416db6e77d220c3f..fd9376ae3540a38088a53d0f54ccdde92562d46b 100644 (file)
--- a/gtk/gtklistbox.c
+++ b/gtk/gtklistbox.c
@@ -21,6 +21,7 @@
 
 #include "gtkactionhelperprivate.h"
 #include "gtkadjustmentprivate.h"
+#include "gtkbinlayout.h"
 #include "gtkbuildable.h"
 #include "gtkcssnodeprivate.h"
 #include "gtkgestureclick.h"
@@ -156,6 +157,7 @@ struct _GtkListBoxClass
 
 typedef struct
 {
+  GtkWidget *child;
   GSequenceIter *iter;
   GtkWidget *header;
   GtkActionHelper *action_helper;
@@ -197,6 +199,7 @@ enum {
   ROW_PROP_0,
   ROW_PROP_ACTIVATABLE,
   ROW_PROP_SELECTABLE,
+  ROW_PROP_CHILD,
 
   /* actionable properties */
   ROW_PROP_ACTION_NAME,
@@ -211,13 +214,16 @@ static GtkBuildableIface *parent_buildable_iface;
 
 static void     gtk_list_box_buildable_interface_init   (GtkBuildableIface *iface);
 
+static void     gtk_list_box_row_buildable_iface_init (GtkBuildableIface *iface);
 static void     gtk_list_box_row_actionable_iface_init  (GtkActionableInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (GtkListBox, gtk_list_box, GTK_TYPE_CONTAINER,
                          G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE,
                                                 gtk_list_box_buildable_interface_init))
-G_DEFINE_TYPE_WITH_CODE (GtkListBoxRow, gtk_list_box_row, GTK_TYPE_BIN,
+G_DEFINE_TYPE_WITH_CODE (GtkListBoxRow, gtk_list_box_row, GTK_TYPE_WIDGET,
                          G_ADD_PRIVATE (GtkListBoxRow)
+                         G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE,
+                                                gtk_list_box_row_buildable_iface_init )
                          G_IMPLEMENT_INTERFACE (GTK_TYPE_ACTIONABLE, gtk_list_box_row_actionable_iface_init))
 
 static void                 gtk_list_box_apply_filter_all             (GtkListBox          *box);
@@ -328,6 +334,29 @@ static guint signals[LAST_SIGNAL] = { 0 };
 static GParamSpec *row_properties[LAST_ROW_PROPERTY] = { NULL, };
 static guint row_signals[ROW__LAST_SIGNAL] = { 0 };
 
+
+static GtkBuildableIface *parent_row_buildable_iface;
+
+static void
+gtk_list_box_row_buildable_add_child (GtkBuildable *buildable,
+                                      GtkBuilder   *builder,
+                                      GObject      *child,
+                                      const gchar  *type)
+{
+  if (GTK_IS_WIDGET (child))
+    gtk_list_box_row_set_child (GTK_LIST_BOX_ROW (buildable), GTK_WIDGET (child));
+  else
+    parent_row_buildable_iface->add_child (buildable, builder, child, type);
+}
+
+static void
+gtk_list_box_row_buildable_iface_init (GtkBuildableIface *iface)
+{
+  parent_row_buildable_iface = g_type_interface_peek_parent (iface);
+
+  iface->add_child = gtk_list_box_row_buildable_add_child;
+}
+
 /**
  * gtk_list_box_new:
  *
@@ -2605,7 +2634,7 @@ gtk_list_box_insert (GtkListBox *box,
   else
     {
       row = GTK_LIST_BOX_ROW (gtk_list_box_row_new ());
-      gtk_container_add (GTK_CONTAINER (row), child);
+      gtk_list_box_row_set_child (GTK_LIST_BOX_ROW (row), child);
     }
 
   if (box->sort_func != NULL)
@@ -2851,6 +2880,42 @@ gtk_list_box_row_new (void)
   return g_object_new (GTK_TYPE_LIST_BOX_ROW, NULL);
 }
 
+/**
+ * gtk_list_box_row_set_child:
+ * @row: a #GtkListBoxRow
+ * @child: (allow-none): the child widget
+ *
+ * Sets the child widget of @self.
+ */
+void
+gtk_list_box_row_set_child (GtkListBoxRow *row,
+                            GtkWidget     *child)
+{
+  GtkListBoxRowPrivate *priv = ROW_PRIV (row);
+
+  g_clear_pointer (&priv->child, gtk_widget_unparent);
+
+  priv->child = child;
+  if (child)
+    gtk_widget_set_parent (child, GTK_WIDGET (row));
+
+  g_object_notify_by_pspec (G_OBJECT (row), row_properties[ROW_PROP_CHILD]);
+}
+
+/**
+ * gtk_list_box_row_get_child:
+ * @row: a #GtkListBoxRow
+ *
+ * Gets the child widget of @row.
+ *
+ * Returns: (nullable) (transfer none): the child widget of @row
+ */
+GtkWidget *
+gtk_list_box_row_get_child (GtkListBoxRow *row)
+{
+  return ROW_PRIV (row)->child;
+}
+
 static void
 gtk_list_box_row_set_focus (GtkListBoxRow *row)
 {
@@ -2868,9 +2933,7 @@ gtk_list_box_row_focus (GtkWidget        *widget,
 {
   GtkListBoxRow *row = GTK_LIST_BOX_ROW (widget);
   gboolean had_focus = FALSE;
-  GtkWidget *child;
-
-  child = gtk_bin_get_child (GTK_BIN (widget));
+  GtkWidget *child = ROW_PRIV (row)->child;
 
   g_object_get (widget, "has-focus", &had_focus, NULL);
   if (had_focus)
@@ -3233,6 +3296,9 @@ gtk_list_box_row_get_property (GObject    *obj,
     case ROW_PROP_ACTION_TARGET:
       g_value_set_variant (value, gtk_action_helper_get_action_target_value (ROW_PRIV (row)->action_helper));
       break;
+    case ROW_PROP_CHILD:
+      g_value_set_object (value, gtk_list_box_row_get_child (row));
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, property_id, pspec);
       break;
@@ -3261,6 +3327,9 @@ gtk_list_box_row_set_property (GObject      *obj,
     case ROW_PROP_ACTION_TARGET:
       gtk_list_box_row_set_action_target_value (GTK_ACTIONABLE (row), g_value_get_variant (value));
       break;
+    case ROW_PROP_CHILD:
+      gtk_list_box_row_set_child (row, g_value_get_object (value));
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, property_id, pspec);
       break;
@@ -3307,6 +3376,7 @@ gtk_list_box_row_dispose (GObject *object)
   GtkListBoxRowPrivate *priv = ROW_PRIV (row);
 
   g_clear_object (&priv->action_helper);
+  g_clear_pointer (&priv->child, gtk_widget_unparent);
 
   G_OBJECT_CLASS (gtk_list_box_row_parent_class)->dispose (object);
 }
@@ -3333,8 +3403,6 @@ gtk_list_box_row_class_init (GtkListBoxRowClass *klass)
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
-  gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_LIST_BOX_ROW_ACCESSIBLE);
-
   object_class->get_property = gtk_list_box_row_get_property;
   object_class->set_property = gtk_list_box_row_set_property;
   object_class->finalize = gtk_list_box_row_finalize;
@@ -3391,11 +3459,20 @@ gtk_list_box_row_class_init (GtkListBoxRowClass *klass)
                           TRUE,
                           G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
 
+  row_properties[ROW_PROP_CHILD] =
+    g_param_spec_object ("child",
+                         P_("Child"),
+                         P_("The child widget"),
+                         GTK_TYPE_WIDGET,
+                         G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
+
   g_object_class_install_properties (object_class, LAST_ROW_PROPERTY, row_properties);
 
   g_object_class_override_property (object_class, ROW_PROP_ACTION_NAME, "action-name");
   g_object_class_override_property (object_class, ROW_PROP_ACTION_TARGET, "action-target");
 
+  gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BIN_LAYOUT);
+  gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_LIST_BOX_ROW_ACCESSIBLE);
   gtk_widget_class_set_css_name (widget_class, I_("row"));
 }
 

diff --git a/gtk/gtklistbox.h b/gtk/gtklistbox.h
index bcd1d1da9618e829dd9ca7c39016babfbccd23fd..57f26f8c3bda3427ff5250de8ae1e875f16859cd 100644 (file)
--- a/gtk/gtklistbox.h
+++ b/gtk/gtklistbox.h
@@ -26,7 +26,7 @@
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#include <gtk/gtkbin.h>
+#include <gtk/gtkcontainer.h>
 
 G_BEGIN_DECLS
 
@@ -48,7 +48,7 @@ typedef struct _GtkListBoxRowClass   GtkListBoxRowClass;
 
 struct _GtkListBoxRow
 {
-  GtkBin parent_instance;
+  GtkWidget parent_instance;
 };
 
 /**
@@ -58,7 +58,7 @@ struct _GtkListBoxRow
  */
 struct _GtkListBoxRowClass
 {
-  GtkBinClass parent_class;
+  GtkWidgetClass parent_class;
 
   /*< public >*/
 
@@ -129,6 +129,13 @@ GDK_AVAILABLE_IN_ALL
 GType      gtk_list_box_row_get_type      (void) G_GNUC_CONST;
 GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_list_box_row_new           (void);
+
+GDK_AVAILABLE_IN_ALL
+void       gtk_list_box_row_set_child     (GtkListBoxRow *row,
+                                           GtkWidget      *child);
+GDK_AVAILABLE_IN_ALL
+GtkWidget *gtk_list_box_row_get_child     (GtkListBoxRow *row);
+
 GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_list_box_row_get_header    (GtkListBoxRow *row);
 GDK_AVAILABLE_IN_ALL

diff --git a/gtk/gtkshortcutswindow.c b/gtk/gtkshortcutswindow.c
index e98644fb0926beb037ca163cecfd96de7a84be1b..60ed0cca536d14139454c2f461afacba434302aa 100644 (file)
--- a/gtk/gtkshortcutswindow.c
+++ b/gtk/gtkshortcutswindow.c
@@ -365,7 +365,7 @@ gtk_shortcuts_window_add_section (GtkShortcutsWindow  *self,
                         "xalign", 0.5f,
                         NULL);
   g_object_set_data (G_OBJECT (section), "gtk-shortcuts-title", label);
-  gtk_container_add (GTK_CONTAINER (row), GTK_WIDGET (label));
+  gtk_list_box_row_set_child (GTK_LIST_BOX_ROW (row), GTK_WIDGET (label));
   gtk_container_add (GTK_CONTAINER (priv->list_box), GTK_WIDGET (row));
 
   update_title_stack (self);

diff --git a/gtk/gtkstacksidebar.c b/gtk/gtkstacksidebar.c
index 8dfed9c749e4a43f92247c9463738c134dae9f9b..b28ad7c17a3f625f5dceda2b29d4a08eea95fa38 100644 (file)
--- a/gtk/gtkstacksidebar.c
+++ b/gtk/gtkstacksidebar.c
@@ -194,7 +194,7 @@ update_row (GtkStackSidebar *self,
                 "visible", &visible,
                 NULL);
 
-  item = gtk_bin_get_child (GTK_BIN (row));
+  item = gtk_list_box_row_get_child (GTK_LIST_BOX_ROW (row));
   gtk_label_set_text (GTK_LABEL (item), title);
 
   gtk_widget_set_visible (row, visible && title != NULL);
@@ -231,7 +231,7 @@ add_child (guint            position,
   gtk_widget_set_halign (item, GTK_ALIGN_START);
   gtk_widget_set_valign (item, GTK_ALIGN_CENTER);
   row = gtk_list_box_row_new ();
-  gtk_container_add (GTK_CONTAINER (row), item);
+  gtk_list_box_row_set_child (GTK_LIST_BOX_ROW (row), item);
 
   page = g_list_model_get_item (G_LIST_MODEL (self->pages), position);
   update_row (self, page, row);

diff --git a/gtk/inspector/actions.c b/gtk/inspector/actions.c
index 4d2daf0b0cd9cda251c212d1799c0f7552c15dd7..c50b71cd461a62637819511da2cbeb876e85f59c 100644 (file)
--- a/gtk/inspector/actions.c
+++ b/gtk/inspector/actions.c
@@ -88,7 +88,7 @@ add_action (GtkInspectorActions *sl,
 
   gtk_list_box_row_set_activatable (GTK_LIST_BOX_ROW (row), FALSE);
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-  gtk_container_add (GTK_CONTAINER (row), box);
+  gtk_list_box_row_set_child (GTK_LIST_BOX_ROW (row), box);
 
   label = gtk_label_new (name);
   gtk_widget_add_css_class (label, "cell");

diff --git a/gtk/inspector/controllers.c b/gtk/inspector/controllers.c
index 95b9ff3efa8b0a1844f224251e507709fc871c3c..a36e1ee30456a7d8b3ad0c85c7f5b5436b2bb6af 100644 (file)
--- a/gtk/inspector/controllers.c
+++ b/gtk/inspector/controllers.c
@@ -122,7 +122,7 @@ create_controller_widget (gpointer item,
   row = gtk_list_box_row_new ();
   gtk_list_box_row_set_activatable (GTK_LIST_BOX_ROW (row), FALSE);
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 40);
-  gtk_container_add (GTK_CONTAINER (row), box);
+  gtk_list_box_row_set_child (GTK_LIST_BOX_ROW (row), box);
   gtk_widget_set_margin_start (box, 10);
   gtk_widget_set_margin_end (box, 10);
   gtk_widget_set_margin_top (box, 10);

diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c
index 3cb2a3f6f2b7d6b18f599be091fbdc54c7e23da3..5bffd5b1b7a5a3473504221f46ef6a300dc34515 100644 (file)
--- a/gtk/inspector/general.c
+++ b/gtk/inspector/general.c
@@ -184,7 +184,7 @@ add_check_row (GtkInspectorGeneral *gen,
   gtk_container_add (GTK_CONTAINER (box), check);
 
   row = gtk_list_box_row_new ();
-  gtk_container_add (GTK_CONTAINER (row), box);
+  gtk_list_box_row_set_child (GTK_LIST_BOX_ROW (row), box);
   gtk_list_box_row_set_activatable (GTK_LIST_BOX_ROW (row), FALSE);
 
   gtk_widget_set_hexpand (box, FALSE);
@@ -227,7 +227,7 @@ add_label_row (GtkInspectorGeneral *gen,
   gtk_container_add (GTK_CONTAINER (box), label);
 
   row = gtk_list_box_row_new ();
-  gtk_container_add (GTK_CONTAINER (row), box);
+  gtk_list_box_row_set_child (GTK_LIST_BOX_ROW (row), box);
   gtk_list_box_row_set_activatable (GTK_LIST_BOX_ROW (row), FALSE);
 
   gtk_widget_set_hexpand (box, FALSE);

diff --git a/gtk/inspector/object-tree.c b/gtk/inspector/object-tree.c
index 5676b3586edd0bcbda19f9616c01a6b9fb13a735..239f70358a20eefcd0f7ff0669ed80db8ac4e5d4 100644 (file)
--- a/gtk/inspector/object-tree.c
+++ b/gtk/inspector/object-tree.c
@@ -999,7 +999,7 @@ gtk_inspector_object_tree_create_list_widget (gpointer row_item,
     }
 
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-  gtk_container_add (GTK_CONTAINER (row), box);
+  gtk_list_box_row_set_child (GTK_LIST_BOX_ROW (row), box);
 
   column = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_size_group_add_widget (wt->priv->type_size_group, column);

diff --git a/gtk/inspector/prop-list.c b/gtk/inspector/prop-list.c
index 380b3511e7cebcfd97b91b857ba88de2dcc90855..53600015a50a60ad42a5a634c10401b352ade242 100644 (file)
--- a/gtk/inspector/prop-list.c
+++ b/gtk/inspector/prop-list.c
@@ -529,7 +529,7 @@ gtk_inspector_prop_list_create_row (GtkInspectorPropList *pl,
   g_object_set_data (G_OBJECT (row), "pspec", prop);
 
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-  gtk_container_add (GTK_CONTAINER (row), box);
+  gtk_list_box_row_set_child (GTK_LIST_BOX_ROW (row), box);
 
   label = gtk_label_new (prop->name);
   gtk_widget_add_css_class (label, "cell");

diff --git a/gtk/inspector/recorder.c b/gtk/inspector/recorder.c
index d59d7ca8a6f093fa3333bc456c562c36ff9fe608..af212bed91149a93188fd7a9bf36078d6482bf24 100644 (file)
--- a/gtk/inspector/recorder.c
+++ b/gtk/inspector/recorder.c
@@ -307,7 +307,7 @@ create_widget_for_render_node (gpointer row_item,
   node = gtk_render_node_paintable_get_render_node (GTK_RENDER_NODE_PAINTABLE (paintable));
   row = gtk_list_box_row_new ();
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
-  gtk_container_add (GTK_CONTAINER (row), box);
+  gtk_list_box_row_set_child (GTK_LIST_BOX_ROW (row), box);
 
   /* expander */
   depth = gtk_tree_list_row_get_depth (row_item);

diff --git a/gtk/inspector/size-groups.c b/gtk/inspector/size-groups.c
index 10d3d24286052c6fbd50854028f5a5eddb239b10..dd39b8293bda38af413d813c09c1cdd38fa9cd06 100644 (file)
--- a/gtk/inspector/size-groups.c
+++ b/gtk/inspector/size-groups.c
@@ -214,7 +214,7 @@ add_widget (GtkInspectorSizeGroups *sl,
   gtk_widget_set_margin_bottom (label, 10);
   gtk_widget_set_halign (label, GTK_ALIGN_START);
   gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
-  gtk_container_add (GTK_CONTAINER (row), label);
+  gtk_list_box_row_set_child (GTK_LIST_BOX_ROW (row), label);
   gtk_container_add (GTK_CONTAINER (listbox), row);
 }
 

diff --git a/gtk/inspector/type-info.c b/gtk/inspector/type-info.c
index d4990f1de4842a05611359533d9491a9934c77a4..9f793d9b05f4f0420304fdd1035aa68ed466b2ab 100644 (file)
--- a/gtk/inspector/type-info.c
+++ b/gtk/inspector/type-info.c
@@ -68,7 +68,7 @@ add_row (GtkContainer *box,
                         "xalign", 0.0,
                         NULL);
 
-  gtk_container_add (GTK_CONTAINER (row), label);
+  gtk_list_box_row_set_child (GTK_LIST_BOX_ROW (row), label);
   gtk_container_add (box, row);
 }
 

diff --git a/gtk/ui/gtkplacesviewrow.ui b/gtk/ui/gtkplacesviewrow.ui
index bd4ec79d896a3cfc43a56a1551866e179c00260e..915d20a189fb4d5607d96aa92b492b438f9c6350 100644 (file)
--- a/gtk/ui/gtkplacesviewrow.ui
+++ b/gtk/ui/gtkplacesviewrow.ui
@@ -3,7 +3,7 @@
   <requires lib="gtk+" version="3.16"/>
   <template class="GtkPlacesViewRow" parent="GtkListBoxRow">
     <property name="width-request">100</property>
-    <child>
+    <property name="child">
       <object class="GtkBox" id="box">
         <property name="margin-start">12</property>
         <property name="margin-end">12</property>
@@ -79,6 +79,6 @@
           </object>
         </child>
       </object>
-    </child>
+    </property>
   </template>
 </interface>

diff --git a/gtk/ui/gtksidebarrow.ui b/gtk/ui/gtksidebarrow.ui
index e2dc4794762430a87f755c5f81be883eb7d83f11..38ecbf3be8ef0da8128717e26695c7db0d661745 100644 (file)
--- a/gtk/ui/gtksidebarrow.ui
+++ b/gtk/ui/gtksidebarrow.ui
@@ -7,7 +7,7 @@
     <style>
       <class name="sidebar-row"/>
     </style>
-    <child>
+    <property name="child">
       <object class="GtkRevealer" id="revealer">
         <property name="reveal-child">1</property>
         <signal name="notify::child-revealed" handler="on_child_revealed"/>
@@ -67,6 +67,6 @@
           </object>
         </child>
       </object>
-    </child>
+    </property>
   </template>
 </interface>

diff --git a/tests/testlist.c b/tests/testlist.c
index d0ff42a902e126600e4c9de8f82bccb8a1bb8a90..c382097a1103f751678e09341b6656f0a79a4a96 100644 (file)
--- a/tests/testlist.c
+++ b/tests/testlist.c
@@ -51,7 +51,7 @@ row_new (const gchar* text, gint sort_id) {
   if (text != NULL)
     {
       row->label = gtk_label_new (text);
-      gtk_container_add (GTK_CONTAINER (row), row->label);
+      gtk_list_box_row_set_child (GTK_LIST_BOX_ROW (row), row->label);
       gtk_widget_show (row->label);
     }
   row->sort_id = sort_id;
@@ -317,14 +317,14 @@ main (int argc, char *argv[])
   gtk_container_add (GTK_CONTAINER (row_vbox), row_hbox);
   check = gtk_check_button_new ();
   gtk_container_add (GTK_CONTAINER (row_vbox), check);
-  gtk_container_add (GTK_CONTAINER (row), row_vbox);
+  gtk_list_box_row_set_child (GTK_LIST_BOX_ROW (row), row_vbox);
   gtk_container_add (GTK_CONTAINER (list), row);
 
   row = row_new (NULL, 0);
   button = gtk_button_new_with_label ("focusable row");
   gtk_widget_set_hexpand (button, FALSE);
   gtk_widget_set_halign (button, GTK_ALIGN_START);
-  gtk_container_add (GTK_CONTAINER (row), button);
+  gtk_list_box_row_set_child (GTK_LIST_BOX_ROW (row), button);
   gtk_container_add (GTK_CONTAINER (list), row);
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);

diff --git a/tests/testlist3.c b/tests/testlist3.c
index bc2f61e83fcd7074aaad1d71f0b346fc9d580452..b067a5b42c6e0de08dff41a202bff6e76d3bb45a 100644 (file)
--- a/tests/testlist3.c
+++ b/tests/testlist3.c
@@ -68,7 +68,7 @@ create_row (const gchar *text)
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
   g_object_set (box, "margin-start", 10, "margin-end", 10, NULL);
   label = gtk_label_new (text);
-  gtk_container_add (GTK_CONTAINER (row), box);
+  gtk_list_box_row_set_child (GTK_LIST_BOX_ROW (row), box);
   gtk_widget_set_hexpand (label, TRUE);
   gtk_container_add (GTK_CONTAINER (box), label);
   gtk_container_add (GTK_CONTAINER (box), image);
@@ -91,7 +91,7 @@ on_row_activated (GtkListBox *self,
                   GtkWidget  *child)
 {
   const char *id;
-  id = g_object_get_data (G_OBJECT (gtk_bin_get_child (GTK_BIN (child))), "id");
+  id = g_object_get_data (G_OBJECT (gtk_list_box_row_get_child (GTK_LIST_BOX_ROW (child))), "id");
   g_message ("Row activated %p: %s", child, id);
 }
 

diff --git a/tests/testscrolledge.c b/tests/testscrolledge.c
index b6b393167f8be244233f818e017e1d94ba9a22ff..97d50ded68b916cc34b300183d79c4507fb88ed3 100644 (file)
--- a/tests/testscrolledge.c
+++ b/tests/testscrolledge.c
@@ -45,7 +45,7 @@ populate_list (GtkListBox *list)
       gtk_widget_set_margin_top (label, 10);
       gtk_widget_set_margin_bottom (label, 10);
       gtk_widget_set_halign (label, GTK_ALIGN_START);
-      gtk_container_add (GTK_CONTAINER (row), label);
+      gtk_list_box_row_set_child (GTK_LIST_BOX_ROW (row), label);
       gtk_container_add (GTK_CONTAINER (list), row);
     }
 }

diff --git a/testsuite/gtk/listbox.c b/testsuite/gtk/listbox.c
index e868f9ae9efba26e93dce27ab2786276844698b7..49e3e996bf705b4d619f1f133d2cbd3974ddc8e4 100644 (file)
--- a/testsuite/gtk/listbox.c
+++ b/testsuite/gtk/listbox.c
@@ -11,10 +11,10 @@ sort_list (GtkListBoxRow *row1,
 
   (*count)++;
 
-  label1 = gtk_bin_get_child (GTK_BIN (row1));
+  label1 = gtk_list_box_row_get_child (row1);
   n1 = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (label1), "data"));
 
-  label2 = gtk_bin_get_child (GTK_BIN (row2));
+  label2 = gtk_list_box_row_get_child (row2);
   n2 = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (label2), "data"));
 
   return (n1 - n2);
@@ -34,7 +34,7 @@ check_sorted (GtkListBox *list)
     {
       row = l->data;
       n1 = n2;
-      label = gtk_bin_get_child (GTK_BIN (row));
+      label = gtk_list_box_row_get_child (GTK_LIST_BOX_ROW (row));
       n2 = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (label), "data"));
       g_assert_cmpint (n1, <=, n2);
     }
@@ -274,7 +274,7 @@ filter_func (GtkListBoxRow *row,
 
   (*count)++;
 
-  child = gtk_bin_get_child (GTK_BIN (row));
+  child = gtk_list_box_row_get_child (row);
   i = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (child), "data"));
 
   return (i % 2) == 0;
@@ -356,7 +356,7 @@ header_func (GtkListBoxRow *row,
 
   (*count)++;
 
-  child = gtk_bin_get_child (GTK_BIN (row));
+  child = gtk_list_box_row_get_child (row);
   i = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (child), "data"));
 
   if (i % 2 == 0)